From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Wed, 26 Feb 2020 19:55:09 +0000 (+0100)
Subject: Re-configure max open files if setting soft limit has failed
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~5^2~6^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=36123fbfde87bd92fb427da4bac4ac3050152ac2;p=siridb-server.git

Re-configure max open files if setting soft limit has failed
---

diff --git a/src/siri/cfg/cfg.c b/src/siri/cfg/cfg.c
index 93fe561e..9a6c8b47 100644
--- a/src/siri/cfg/cfg.c
+++ b/src/siri/cfg/cfg.c
@@ -577,6 +577,7 @@ static void SIRI_CFG_read_max_open_files(cfgparser_t * cfgparser)
 
     if (min_limit > (uint64_t) rlim.rlim_cur)
     {
+        rlim_t prev = rlim.rlim_cur;
         log_info(
                 "Increasing soft-limit from %d to %d since we want "
                 "to use only %d%% from the soft-limit for shard files",
@@ -586,7 +587,7 @@ static void SIRI_CFG_read_max_open_files(cfgparser_t * cfgparser)
         rlim.rlim_cur = min_limit;
         if (setrlimit(RLIMIT_NOFILE, &rlim))
         {
-            siri_cfg.max_open_files = (uint16_t) (rlim.rlim_cur / 2);
+            siri_cfg.max_open_files = (uint16_t) (prev / 2);
             log_warning("Could not set the soft-limit to %d, "
                     "changing max open files to: %u",
                     min_limit, siri_cfg.max_open_files);